I was about to say it looks like you did. I'd go with the Black Widow and the BHO.